Don't use GDK_WINDOW_SCREEN, as its an X11 specific macro
authorAlexander Larsson <alexl@redhat.com>
Wed, 1 Jul 2009 08:23:29 +0000 (10:23 +0200)
committerAlexander Larsson <alexl@redhat.com>
Wed, 1 Jul 2009 08:28:05 +0000 (10:28 +0200)
gdk/gdkwindow.c

index 326c9837d39a1b689e0805c0760b5c14bc0695dd..0e4669132a5d89f499117487f060a8fde9a24c88 100644 (file)
@@ -1314,6 +1314,7 @@ gdk_window_reparent (GdkWindow *window,
   GdkWindowObject *private;
   GdkWindowObject *new_parent_private;
   GdkWindowObject *old_parent;
+  GdkScreen *screen;
   gboolean show, was_toplevel, was_mapped;
   gboolean do_reparent_to_impl;
 
@@ -1325,8 +1326,9 @@ gdk_window_reparent (GdkWindow *window,
       (new_parent && GDK_WINDOW_DESTROYED (new_parent)))
     return;
 
+  screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
   if (!new_parent)
-    new_parent = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window));
+    new_parent = gdk_screen_get_root_window (screen);
 
   private = (GdkWindowObject *) window;
   new_parent_private = (GdkWindowObject *)new_parent;
@@ -1392,7 +1394,7 @@ gdk_window_reparent (GdkWindow *window,
    */
   if (GDK_WINDOW_TYPE (new_parent) == GDK_WINDOW_FOREIGN)
     {
-      new_parent = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window));
+      new_parent = gdk_screen_get_root_window (screen);
       new_parent_private = (GdkWindowObject *)new_parent;
     }